Revert "Revision 15"

This reverts commit e79e410d09398f14a60fb33086b6ba5272c9767b.