Revert c6d7887..fbce147

This rolls back to commit c6d7887c53f407893e8185cce27c3c17e3817136.