Revert 96e75ba..6a9901b

This rolls back to commit 96e75ba9c5c32b74b7b4435b25428d5bb31a6e14.