Revert "Revert "Revert "1.007"""

This reverts commit 12d4fe228cb01eed0335410f50d426643e4687f3.