Reverse the last hack and really (try to) solve it