Revert 5b5fe2c..0659edc

This rolls back to commit 5b5fe2c0670c46c45f4e630bad93711390507ed8.