Try to fix physics performance and keep Portal

Register and unregister the event handler... we'll see!