Revert fcb6624..cc8dc6a

This rolls back to commit fcb6624955045bb396857df505428f8db82cf84c.