Revert 6fa10e2..c7f391c

This rolls back to commit 6fa10e2652e2d67db104bb2c7ae5382917de5bb2.