Revert bb90102..83a9df6

This rolls back to commit bb90102112cf3700d3d71b03fac6ecf2445b68c2.