Revert f0b5f4d..57aec24

This rolls back to commit f0b5f4dfaf16a145d0801f41da65938931c17da9.