Revert 398cd36..0b8fc00

This rolls back to commit 398cd36e6d8e75ce57eade8980539588052b6977.