Revert 30f4703..60ae2ca

This rolls back to commit 30f470309bfbc7c6f4b697f8eb29ada04a02795f.