Revert 595abf6..194802d

This rolls back to commit 595abf63dced90c32a86e508ffb24ba0a00e4c8f.