Revert 28b886e..9422860

This rolls back to commit 28b886e1f576bba4040a3c4f1c975daaa7e5ec51.