Revert beed1d0..9242aac

This rolls back to commit beed1d0eb9ae47af5a1551c09e2cfd326057b5f2.