Revert "Merge remote-tracking branch 'omap-mirror/p-jb-mr1-release' into HEAD"

This reverts commit 6c58e520dc17fb08fa66b4e116f9c822c57e1bb3, reversing
changes made to bfe5d5481220e687e445c9ca27d08fec1ea5eccd.
1 file changed