Revert "Added DisplayAttribute"

This reverts commit a568c3821e6ee7bb28363862acee1d18d205ca1c.

This patch was already included so it create conflicts