Revert adb2b40..06481f6

This rolls back to commit adb2b4046b7194e66ebadcaf785b88104b002d88.
Revert and rename