Amend fe0a24f
fe0a24f
Removed mulit-viewpot stuff in this commit on master, will be re-added separately.