Revert 5c21ac1..0ee1235

This rolls back to commit 5c21ac18785e76edb0e4b1b6fd959f45eb22561d.