Revert c11a05b..c024d49

This rolls back to commit c11a05b3942c5152e7d76a095adacf901bf9019c.
All issues fixed