Revert 23fa7f9..70221bc

This rolls back to commit 23fa7f9ab8197e7261ac8f3c6a6774bd5d097984.