Reverted commit 4533f08d30d8d434df932418dbeb883fd811d769. This approach does not work.