Revert f6819f0..5bfab19

This rolls back to commit f6819f0a17064facfaa1ba32046fc0e0cd9291c9.