Revert 0b69a47..0112182

This rolls back to commit 0b69a47c33d441c74eeeee6cd038ce245a9d1d71.