Revert 65f292f..4137ab2

This rolls back to commit 65f292f77bff58cbaf5906b6ab660a49c0fadda2.