Revert c5b40ab..ea08e70

This rolls back to commit c5b40abe7222a3a541fcc53e0af2a4b72facdf6e.