This reverts commit 61c94cbe (as it
touched values which are not in the spec) and sets the correct paragraph
top/bottom margin in case the compat option is enabled.

Change-Id: I152a76d8fcdef3acf5491783c2ccacd2d48e76b3