Revert ce2d0ee..aefcbae

This rolls back to commit ce2d0eecb411aeae345ca7c644b9b58c442f47bb.