Revert db48039..2cca229

This rolls back to commit db480397babe8c8a7308a6dd00e0c84a1d93adb9.