Revert 4582d70..a4fb0b4

This rolls back to commit 4582d70a92ef300c6cf25d502ed73d782eee9eed.