Revert 8e4ea63..842603b

This rolls back to commit 8e4ea6347bf70d005edc7bf8ed73089d82d87b84.