Revert 05e5523..efee684

This rolls back to commit 05e55239f81124275eb73400e88b4543417e297f.