Revert 4f0fbc4..808e362

This rolls back to commit 4f0fbc4ef4a4eeccd20310a81446bda1797b3ad2.