Revert 8515a0a..5e27e4d

This rolls back to commit 8515a0a3cce725351f769896065980a044300a00.