Revert "Fix mismatch of captions with labels"

This reverts commit 1df1e1703d9388095f5c59881db101b0414c851e.

Decide to do this is a project specific branch.