Revert 7e97aa3..f4a3cc3

This rolls back to commit 7e97aa3300703a8a1d68713769295d637f52a582.