Merge branch 'revert-placeholder' into 'master'

Revert "Changed the placeholder text and modified the css class to make it visible"

This reverts commit c39c8234.

/cc @marin

See merge request !845