Roll back from tweaks

This reverts commit 7e17d03d68165e23571e2237734ab2b4490ef675.