Revert 6f12cdf..554a1d6

This rolls back to commit 6f12cdf23935a245a6948f0b74d0b6f2255593a2.