Revert 0810771..eb374f8

This rolls back to commit 08107711696503ed01ef3f973a072603435a314b.