Revert 760fd49..64fdb6d

This rolls back to commit 760fd49d0558a8bf151a6f1763a665160f1e90b2.