Revert 63a0262..ecd6e46

This rolls back to commit 63a0262c38db62ba1ee3f38f1acb4d0f064ad929.