Revert "Chem machinery fixes"

This reverts commit 52a64a21e27c5d72bdb7cb266c106fc4da183dc5.