Revert "everything works -> cpu intensive"

This reverts commit ba695a7fb96f206ff9ca7e5e0452c9c3db735d34.