Playing with reverts

Changes the comments + ctors back to where they were with 05af1d7.