Revert 2

This rolls back to commit ce058dac706f2a994396c02e2947681e8f00335b.