Revert "How about marging to the right place too?"

This reverts commit 2d534876a838acd2f6ce704b069eccc99d3b4c55.