This incomprehensible mess don't seem to be needed anymore..