Revert 9cf3eb7..2270fe3

This rolls back to commit 9cf3eb760c704184702c528a3ff69aaa24641420.