Revert de7b31d..cf6e2cc

This rolls back to commit de7b31d3bd46e9de9e242e1c983745ad584d1583.