Revert fbddd59..950b39f

This rolls back to commit fbddd59319934ad36d563ee9c0b0b1fc4c3b5642.