Revert e7cd8e8..dae64f6

This rolls back to commit e7cd8e8f9226167864c4ae242b8de69a0b1bad9f.