Revert cf6d559..065f167

This rolls back to commit cf6d5598d7217f7c12b8ea49af526aac7b01aeb9.