Revert "Robert's changes fetched and merged"

This reverts commit 168bdc8b495a1227a41f6ab0e3317cadbfc188c6, reversing
changes made to ded06a067ae0f2c59d1a283b17d0274ef79b0336.