Revert 997cdea..5a4e39c

This rolls back to commit 997cdea9a34be020029dafe89e5fdb7cd83471ae.