Revert 90250a0..315d13c

This rolls back to commit 90250a0175c610a7d9c7cd1edf98ae8f1413c934.