Revert 43bf74c..cc1d19c

This rolls back to commit 43bf74c7c023c3b5987e347160abc35459d37c4d.