Revert 26513ec..c11f6f1

This rolls back to commit 26513ecf056d052b285180c755fab78cb1eed138.