Revert edad951..7b09355

This rolls back to commit edad95182d5fc322420ea7ab7410ef986c6b5ed8.