Revert e15149f..420da5a

This rolls back to commit e15149fa55affe9793b0933fe972f43db356fde9.