Revert f9309aa..8aaba22

This rolls back to commit f9309aaf39362051cfb2a5fda8530e685c957367.
Try to start again