Stopgap to introduce basic support for new design.