Revert "fg:x:Merge remote-tracking branch 'origin/master'"

This reverts commit 9a2240a0441b26a21fe2ed3d8276beb8a79a72f1, reversing
changes made to 4402c6c93ecdde83ffadf9be8177178db0292062.