Revert b68bd0d..1faf857

This rolls back to commit b68bd0d11b88d51338e8477ea0cd0bebb171f780.