Revert "OpenPdroid 4/5"

This reverts commit 613b66f1c94e0546476e5dfe54b6a39367bfc03e.