Revert c25b0ed..56fa4b7

This rolls back to commit c25b0ed593dea15041faf7962fa2215010a03700.