Revert 82c0df8..3230d71

This rolls back to commit 82c0df8f44d7e21dc4f003f2610c0d00e5c320c5.