Revert 1d1bc48..709ae66

This rolls back to commit 1d1bc481ce9451b9998c5b6c17c43c8dd2bd2509.