Revert f50c761..bf0b46c

This rolls back to commit f50c761eb42c178b1ffe62ebbb805038e1d91084.