Revert 857b438..2991d6c

This rolls back to commit 857b438be1330d3f00cd05aa206bb47b0051b558.