Revert 1917e9c..44df737

This rolls back to commit 1917e9c5a2bda431231d816a18978d1581ae0c5a.