Revert "Reverting liquid changes"

This reverts commit 5c7dac5ca4d9c27664d93a6dbaa70f318cb665d2.