Revert 6227d10..3164b33

This rolls back to commit 6227d10fe0f65132262118c5ccab70b97d583e68.