Revert 68a3cad..8edab6e

This rolls back to commit 68a3cad7748cfe22a6849355b9f56c6f2fccb63d.