Revert fa3152e..ccb6b10

This rolls back to commit fa3152e535062d0dccf83ffe3bfa6ebc337e792f.