Revert 79403a8..fb1863d

This rolls back to commit 79403a867a3912859c8fe260bc89a14aad931688.