LPS-40791 Do not reverse FROM and TO