Revert "a few changes downstairs..."

This reverts commit a13fb3d367474bd77d1e9c287e70b639e47538e0.