Revert 80e5518..0dc279f

This rolls back to commit 80e5518e1df49891c01270faf38c83653bcde000.