Revert af37ca7..7c44374

This rolls back to commit af37ca76900f4170e441998e7db694afd1a52701.