Revert 2cc8a0e..68a2af8

This rolls back to commit 2cc8a0ec645d27845928a0a27943f28cd963d1b3.
Warning experimental version - PHDBB faults occur