Revert 2abe51a..6e2d9b4

This rolls back to commit 2abe51a197b6dd23008185d500721ae3af8d5897.
debug