Revert 5eadc8a..7f92c8d

This rolls back to commit 5eadc8a6263c447da11ddab4ea82d6f36b0340fe.