Revert 500525c..20fccca

This rolls back to commit 500525c8d0d9b407ff38f7a6b2c1ea0874652e11.