Revert eabac93..6011c42

This rolls back to commit eabac93a230ba73d0dcca5a49eff0c3f2d1a7ed6.