Revert 4278b73..6d8bc6b

This rolls back to commit 4278b73a34de81cd6f777c0191371c9059b449ca.