Revert "Synchronise with official repo"

This reverts commit 636dd64ffeec0de9cdca569a7e1d714006bca810.