Revert 1a8fd62..7b486be

This rolls back to commit 1a8fd62fa3982e7ea471c02d4871af2c1d20bbad.