Revert 57df95d..c066057

This rolls back to commit 57df95d80ecc2d905c478b62bb364c1ff9624d9a.