Revert "Fix #453, incompatible with handlebar syntax"

This reverts commit 893ba4e1e9437baf99d916785d7d577824b78f81.