Reverted to bring back enter-key functionality.