Revert b470494..fe7bb3a by Basil

This rolls back to commit b470494c73c0a98f2ac79cd8748c8f3f8dcec75b.