Revert 39b7ab2..8983012

This rolls back to commit 39b7ab22e13ae26ed4f56bfd2881f06ea282d138.