Revert 7a14f84..1279076

This rolls back to commit 7a14f8492258941edf9deb83898fe68a7534cdcb.