Revert baadfb4..a362f5d

This rolls back to commit baadfb480aa2e21064c46d844c0e16a6dcd0fa43.
Revert a362f5d..591ae12

This rolls back to commit a362f5dd12394575269d73ef0101d27240a8eca2.
restore simple templates for mode="inLanguage"