Revert 4a6b674..672dbd8

This rolls back to commit 4a6b674dc1259dabb0ac64adbf1c0a6079b7e229.