Reverted future changes