Revert 08a3893..eb3803e

This rolls back to commit 08a3893dc305e5ef153d241879b76689c9234c91.