Revert cd95a26..009bee8

This rolls back to commit cd95a267102199a1b8bb632f71b7a8e27678d028.