Revert 532a426..de39335

This rolls back to commit 532a426d3b12e9a4ce6b35796e10f28e69064e69.