Revert 75afa57..4efb032

This rolls back to commit 75afa5722e3ef1015e132593c1ff870e8aa9c664.