Revert "Revert "Revert "Now with WOW"""

This reverts commit e86214b067edee288b864c5a0f5415c1579ef095.