Revert 30d9abe..6e8309b

This rolls back to commit 30d9abe826679f273d68ee65f3942472d8055a6b.