Revert 24ef6d8..f0cc4d7

This rolls back to commit 24ef6d87b853a8ed00f851bfddd98441be2e4c57.