Revert the many un-reviewed commits starting from early April