Revert fe0c2ea..96a630b

This rolls back to commit fe0c2ea1b7c8fd4c2df913681a75416130c73a42.