Revert 13495c1..c7f9af3

This rolls back to commit 13495c169f460d3f88d27d521e60a9719ac7d0d2.
Revert c7f9af3..38afbc9

This rolls back to commit c7f9af3ae83d44abadbb9bc1e5c77a716735e183.
stopped being a dummy