Revert 82dc8c9..45cbcb9

This rolls back to commit 82dc8c95f0fdfcaeb5d6371cb4862eff4a1b941f.