Revert 5dae795..0e4c50d

This rolls back to commit 5dae795aab64bf1ec927de924d60f096f51b3a87.