Revert 6ba688f..cbcaba5

This rolls back to commit 6ba688fd3b7fefc0878f5ae43c5df41a4d767fae.