Revert "Merge remote-tracking branch 'alex/i584' into beta"

This reverts commit 5bca1893115c9b8013a1c86b11f231167f520255, reversing
changes made to 82341a1b260ad74636fee5e8279d0857c260f15e.