Revert a1e620e..0780c0b

This rolls back to commit a1e620e215d0407f0ef544e852b72bc87d07087b.