revert quick fix so that I can start really fixing it