Revert b2946f1..3ebd356

This rolls back to commit b2946f138af5f85abecc610db3fb5686bf3daf54.