Revert 78e5a3b..1ee3293

This rolls back to commit 78e5a3ba1f4215d1e666ba579f7525e38ae589f5.