Revert 5394af1..05db5cc

This rolls back to commit 5394af1bca137e1ceeee6bc9603a92a38daf767f.