Revert 58fea58..a0d7764

This rolls back to commit 58fea58925009859b5526530be30248826b4051c.