Revert 7b2a40b..222b6dc

This rolls back to commit 7b2a40bb38240b452b0ce63fb10af01e0ef92330.