Revert 8c2adf5..4a188eb

This rolls back to commit 8c2adf544017a1ed4f41bbe6d94bf4ca90e963e8.