Revert bdc4a6c..c73ec18

This rolls back to commit bdc4a6c01fdc9b5ced4fbfabda9f80fdefe28746.