Revert cef09ac..a34f3d7

This rolls back to commit cef09ac201b9fea8cf7ca5618c5e2910291c907a.