Revert 5da4bfc..c9145dc

This rolls back to commit 5da4bfc77abd00e75c3fa5fe00a64f7e41c07a7e.