Reverted removal of [ ] support