Revert 7853d4e..af45af0

This rolls back to commit 7853d4e02166347594a9936db6da69f8db93d1b0.