Revert 34b8d32..59bec4e

This rolls back to commit 34b8d3258bc666bb5b3b9cc400cc0d901fc69690.