Revert ad7bb1a..695a030

This rolls back to commit ad7bb1ae4e27db59a3f35703bc1228a085596a24.