Revert "One liners."

This reverts commit e2e25627a8e25e1c4e3b61602520742208beef41.