Revert 5e2181c..8f06628

This rolls back to commit 5e2181c543487bb8f470fa2c4ea6054b17c23a2e.
Assembly assignments