Revert e7d91e6..fab76ed

This rolls back to commit e7d91e6b16ac0366d21fb6e942cf72a87698bf21.