Revert d1b5693..e6bfb80

This rolls back to commit d1b56938679feffe1b2d03819b9922e41a0913f7.