Revert e7cf9d4..eb6857b

This rolls back to commit e7cf9d4fc0e595ea5f3549ee22a910f4ab54c681.