Revert 83c0127..9a497ac

This rolls back to commit 83c01274c71994c96dd81aca89fbc4542ed3ef4e.