Revert 0a35110..32ab1d9

This rolls back to commit 0a35110dc3e037aecf683eff9f93228788b32fe5.