Revert be64994..1998f44

This rolls back to commit be649947715879f2312cb68ee976dac5d10c1c89.