Revert 9863093..af9571b

This rolls back to commit 9863093cc319fdcbc5d66ce94699508a988ba18c.