Revert c4b80a1..d94be0e

This rolls back to commit c4b80a1df4f99ec6e73df1320383a258c0658229.