Revert 00c90de..3e564af

This rolls back to commit 00c90dee36e2eacfbf0bc46040dc2f7d62fe192a.