Revert 99c32ca..73983f3

This rolls back to commit 99c32caff8f8f1bd2fd01651143b913cd056f2a6.