Revert 21747b1..a792647

This rolls back to commit 21747b1a94ad0fe696dadcfe3dc0590ca67f552d.
Revert "white"

This reverts commit ba54845b69ecaa5b99878dd43980c6550ae054b0.