LPS-44003 revert changes, this is now the way it is expected to work