Revert aad52c5..cedbed2

This rolls back to commit aad52c5d39bcaac68e40066288846e3a32d23d87.