Revert 7df3cd6..1b0d745

This rolls back to commit 7df3cd64b632a2e4ed533fcf78b28e2b1712120d.