Revert "Merge branch 'temp/0.5_on11' into release/0.5.0"

This reverts commit 93c37c2c73d39bab1e5217c5dfa4328b774b50e4, reversing
changes made to 682418dc91c115d51744265cf3559dc4e4f34b91.