Revert 513035d..a54d50a

This rolls back to commit 513035d57b895171ed36e931c1e0a10066e7244b.