Revert dafdea8..ce65be6

This rolls back to commit dafdea8bbd565e8b7a1e256cf8f5947077c7f70f.