Revert 8a40dda..cca8012

This rolls back to commit 8a40dda457c9dd0acac748c3471e9181cd037847.