Revert 631f8cb..cd656fd

This rolls back to commit 631f8cbf27311d55d2632869ae19c7cd4c5c49d8.