Revert 849372f..c1d72bb

This rolls back to commit 849372f9033ddf93e3bd52cc4be6f1636efcca35.