Revert 522fd90..5089987

This rolls back to commit 522fd90b28d9832b2323b05c36bb624c1f3b8f80.