Revert 63da63a..4bddb1f

This rolls back to commit 63da63aaf031255f85ea7f9a68ecd4856cd59577.