Revert 10d9c8b..11ac233

This rolls back to commit 10d9c8b8f3396da5a6d225bee172d72f4a143f3c.