Revert b32123d..8bd1460

This rolls back to commit b32123de28550367a81e95cffd10dc1709448fca.
delete something