Revert 572f5b8..7e97874

This rolls back to commit 572f5b824a13e1317b4ab199e899442572500060.