Revert 17bbd44..ff6aee9

This rolls back to commit 17bbd445e967bc68e1f647c03236389aa06c8a17.