Revert c1fabfc..f5f439d

This rolls back to commit c1fabfcf0050cf1b11ee590fbc41b9b59b20054f.