Revert 0d2e83b..cff3bd6

This rolls back to commit 0d2e83b83970735ab4c789265d39602e302176c3.