Revert bf85e0c..fa23648

This rolls back to commit bf85e0c3f31607101cd4f5566c896bc7c083f38f.