Revert "Revert "Fixed Noisemaker""

This reverts commit dbf82c17a8b5129c45d64b2100e91e8899654320.
Revert "Revert "Revert "Fixed Noisemaker"""

This reverts commit 38f0c3ecbe7c13257fe13e66e294c98a2e5ba46e.