Revert 6061fff..45762af

This rolls back to commit 6061fff447c77fe1d264fc5b35cdb1cdacf3f507.