Revert 1ca9954..ffaec51

This rolls back to commit 1ca9954625d1c3db7760cca59176efc0b8912110.