Revert cef64bc..47a5ab5

This rolls back to commit cef64bc3545d5fb6e813435c3d482f13cf878caa.