Reverting changes to return null