Revert 7db23fb..f7ffe4a

This rolls back to commit 7db23fb7cca676bcb7b61225b14cc565410c9b8d.