Revert fba787f..d1ea987

This rolls back to commit fba787fb9a7fa55bde059444eb082f55ba32e377.