Revert d3ae374..4bbeb02

This rolls back to commit d3ae374d97cdadd9fc2e4718e3d207dceb2683bf.