Reverted implementation