Revert 750f5c5..0196d36

This rolls back to commit 750f5c5d1406fa2d714994f91d9bfa1e79b423e2.